refetch the accelerator when the accel object is changed. Fixes bug

2001-08-07  James Henstridge  <james@daa.com.au>

	* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
	the accelerator when the accel object is changed.  Fixes bug
	#58628.

diff --git a/ChangeLog b/ChangeLog
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 63a5cf578d852ff3983e21f68f629a72bc026b00..ff8ade769ea2abdceda40e0f71b1b310f99dee1d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-08-07  James Henstridge  <james@daa.com.au>
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_object): refetch
+       the accelerator when the accel object is changed.  Fixes bug
+       #58628.
+
 2001-08-06  HideToshi Tajima  <tajima@eng.sun.com>
 
        * modules/input/gtkimcontextxim.c (mb_to_utf8), xim_text_to_utf8):

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 36397f3132d709b5705f241a6e618c8ab8ac00e9..82b4f35bebfcaeadb85e3029e325c648c0d3cffe 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -383,6 +383,8 @@ gtk_accel_label_set_accel_object (GtkAccelLabel *accel_label,
                                   accel_label,
                                   G_CONNECT_AFTER | G_CONNECT_SWAPPED);
        }
+       gtk_accel_label_refetch (accel_label);
+
        g_object_notify (G_OBJECT (accel_label), "accel_object");
     }
 }